Skip to content

Add desired host phase 2 contents to blueprint #8570

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 11 commits into from
Jul 15, 2025

Conversation

jgallagher
Copy link
Contributor

This is a followup to the stack of PRs that added desired host phase 2 contents to OmicronSledConfig (#8538 and its followups). We now have a BlueprintHostPhase2DesiredSlots inside each BlueprintSledConfig that specifies the desired contents (artifact by hash-and-version or "just the current contents", analogous to the install dataset for zones) for each of the two phase 2 slots.

The actual diff is much smaller than github claims; ~75% of the diff here is expectorate output that changed because our blueprint displays and diffs now include a table for this new information.

Copy link
Contributor

@andrewjstone andrewjstone left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks great!

@@ -1581,6 +1582,8 @@ pub(crate) fn build_initial_blueprint_from_sled_configs(
disks: sled_config.disks.clone(),
datasets,
zones: sled_config.zones.iter().cloned().collect(),
host_phase_2: BlueprintHostPhase2DesiredSlots::current_contents(
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Strange formatting choice by rustfmt.

@jgallagher jgallagher merged commit b854ba2 into main Jul 15, 2025
17 checks passed
@jgallagher jgallagher deleted the john/blueprint-host-phase2-desired branch July 15, 2025 15:29
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants